Merge from emacs-24; up to r108065
authorChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:31:46 +0000 (12:31 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:31:46 +0000 (12:31 +0800)
commit6cec074f994813fa5763b379f29412d51c5ead92
tree1f6e7a5f0c328b34a2d22d2a31be62997b42c850
parent4b3cd8f4ffa6c06cb03b888988224246b93f6f5b
parentbff955eb31f966a887a3f2ad081e57e52d22d594
Merge from emacs-24; up to r108065
doc/emacs/ChangeLog
doc/emacs/basic.texi
doc/emacs/maintaining.texi
lisp/ChangeLog
lisp/files.el
lisp/simple.el